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

Change-Id: I1a341e45630ac63d79b29e1c5142eb3a62b661f7