Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev