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

Change-Id: Ia2bf9359d0b89b18ebc2418470e90a490d247c98