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

Change-Id: I631c75bf6de0a7c26f055c2bb1b8010228b93f48