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

Change-Id: Idec1b1d5e43745b6db43fa9f4ad0ad9c639b58e6