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