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

* commit '2c37f7b45522d908e1ffc5e63ffccfbe4cdea34b':
  Synchronize access to Locked methods. DO NOT MERGE