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

Change-Id: I9675f7cb17617f84396c4278bd9bb278e7be87f9