Merge "Merge "Use correct synchronization lock" into nyc-dev am: 638cc6cac9 am: 23ef1f7653" into nyc-mr1-dev-plus-aosp
am: 111bab51dd
* commit '111bab51dd5ad2e9fda70006b3a2d8914d3cff2e':
Change-Id: If50ef3da160d34305e7aee51439a6738dbaa9581
This commit is contained in: