Merge "base: work around thread safety analysis bug."
am: f3c7f10abd

Change-Id: Ied41fa3a6724c7835ce8636301e1e30c23e1d660