Merge "Workaround bogus Thread Safety Analysis warning"
am: 8bcecf9155

Change-Id: Ic3e01e5a8f411dbf5b9a32b2a9f77e24f2156f84