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

Change-Id: I8a05adfb40068cc3684eff6a7a3946eb84f37a20