Merge "Additional lock to avoid access to deleted object." into rvc-dev am: 28d1236852

Change-Id: I51ba1e6068c9f1bf6f9bf73d07ab831a7094a8be