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

Change-Id: Ie4f12e1412235e507315d1917f52b00a4d732676