Merge "Handle a special case of lock aliasing during lock verification"
am: 91b6befbb0

Change-Id: I375afb0273d7abd1c23e28d55838f7934a4fa147