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