Merge "Revert "Revert "Handle a special case of lock aliasing during lock verification""" am: c1d762ae37
am: 6c0403e385

Change-Id: Ibf324bae5751552443771c9db259b314f5fe7132