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

Change-Id: If05c0ae24796f636d927ed3c4b8b605822b48f8f