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

* commit '513be145b6e7fc3e9d07102e02c20c6f744daceb':
  Avoid deadlock between mUsers and cacheLock