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

Change-Id: I53c883327ce0062f7e7dbcf8df33e6b1be9516f2