Revert "Workaround bogus Thread Safety Analysis warning" am: 92db59bdb2
am: cc03be3383

Change-Id: I6ac390b86c7c07ff3e60e25b8d463f4b05746ff7