Merge "Revert "Handle a special case of lock aliasing during lock verification"" am: 97c465ca am: 4b60df9a am: cf78e8ff Change-Id: I2f6049923bc6ff114586594e6bde1192a99fb246