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: I22a9517d109cc371e2d96f0826aa853e5d12faf0