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

Change-Id: I8f9c6e581ad967280dd44cabdd0aa31866e1ace9