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

Change-Id: Ie7d76a874b82a96ce7e97f2c42a9dfc4735bbbb5