Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R2.10.00.00.685.004' into rvc-d1-dev am: ba237a1ff9 am: d7fa5e00cf

Change-Id: Ic45aee28a36ea2e860c00008778756aeb5395847