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

Change-Id: Iaea4fa2b25162b6a869bad5c493d6d7c2e1b2853