Merge "Handle a special case of lock aliasing during lock verification" am: 91b6befb am: 0ee6bc6f am: 07b1a67c Change-Id: I2f2fde92d067b845bf5231b4132f71f127f73475