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

Change-Id: I7b5a45c9c275e2b04dccbbeceaa3735ab6b600a6