am 78db8500: am 2c37f7b4: Merge "Synchronize access to Locked methods. DO NOT...
am 78db8500: am 2c37f7b4: Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev
* commit '78db8500':
Synchronize access to Locked methods. DO NOT MERGE