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

Change-Id: Ifa8380b9ee451bb27c213d5c68d94e6bd26c243b