Merge "Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.030'" into rvc-dev am: 2667cec0a6

Change-Id: Ic5ea0d8ae9e986ae81f1de3afc73d0bb556d2ed0