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

Change-Id: Id5e5cee1294ae947bc2b9d1ce8d210c595b068cd