Merge "Reduce synchronized lock scope." into oc-mr1-dev