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

Change-Id: I261c4a0244dff0f340cec27506552ffe1081fa7a