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

* commit '7dd4831fd6f8966c6fd765279303b636314b7754':
  Avoid deadlock between mUsers and cacheLock