Merge "Workaround bogus Thread Safety Analysis warning" am: 8bcecf9155 am: 6469f1717f
am: 170c3601a8

Change-Id: If3f49db4db4e332c7195d98b80d328f07f663720