Merge "Reduce synchronized lock scope." into oc-mr1-dev
am: 9b6ef6a8f6

Change-Id: If3837cdad1238d7f8e7c20c9e9eedfe79bc47705