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