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

Change-Id: I4a5a2e3c29afc6f8e195130032cbae8cab00fa2c