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

Change-Id: I8256d260aca83a4df7c20e03ff62f062fdc4d3a1