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

Change-Id: Ia1627170c37617e66317b88a9a8d0e60d2bf7c83