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

Change-Id: Ie28e2e45c10074f883ddc8545006a67e05ffc837