Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.08.00.00.385.245' into pi-dev
am: c4a539f0c5

Change-Id: I58e905792796644cffe40dc9ce07016a52f8216c