Merge "Additional lock to avoid access to deleted object." into rvc-dev am: 28d12368 am: f488b8f8 am: ea4a8c9d Change-Id: I9dccad6de9e879a5b5610b1712dde62276a6f924