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

Change-Id: I78d533b0c4b594ead4994836f3c43b73be176fe9