Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.030' into rvc-dev am: d1e05282d0 am: 1caeb8b527 am: 52d22c33e6

Change-Id: I89d6c8844a44a3a1e01663702f06f9897bf4569c