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

Change-Id: I4cfd66ba2f1748751c5355466bedb36d5d369bba