Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R1.10.00.00.597.032' into rvc-dev am: 5f1f6d2761

Change-Id: Ib0bdf088695ad52d0b8b3870a55213b18edc4d3b