am 81c61fda: am c4b0d098: Merge "Fix an NPE and possible unsynchronized call of Locked method." into jb-dev

* commit '81c61fda9a1b45db4c06d2db2cf24b42045d4f76':
  Fix an NPE and possible unsynchronized call of Locked method.