Merge changes I243988b0,I096b9019,Icf20dc74

* changes:
  Force PMS snapshots
  Remove more mLock usages
  Remove some mutation mLock usages