Merge "Revert "base: work around thread safety analysis bug."" am: b5c90e9d6b
am: 9560524455

Change-Id: I37dc94c066c1527c10488e48c713c29b4e211cfb