Merge "base: work around thread safety analysis bug." am: f3c7f10abd am: f727a3933e am: 14c7e22a50
am: 6db08e9e1f

Change-Id: I49dc1a551ee1da07a41896c62272225f70958ce8