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

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