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

Change-Id: Icddcbe6453bc80190a559958a5aa8d619ea1b9d4