Merge "Merge "Additional lock to avoid access to deleted object." into rvc-dev am: 28d1236852 am: 9c1aebb8d1" into rvc-d1-dev-plus-aosp am: b74b9a711b am: e391a1747a
Change-Id: Ic22eca17a7e464ddf944ec441b1fc020795cb06f
This commit is contained in: