Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.035' into rvc-dev am: aecb2bf532 am: 59a00bf315 am: ed2e1c5542 am: b8fc17f98b

Change-Id: Id599275dac208c6d5f8fb74db2b2d4ce723d2f88