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

Change-Id: I6fa568a220a1571887216b2c604a636c9f976056