am b0975540: Merge "Avoid deadlock between mUsers and cacheLock" into klp-dev

* commit 'b0975540a42f10fad08364b636a22bcba33609a6':
  Avoid deadlock between mUsers and cacheLock