Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.030' into rvc-dev am: d1e05282d0 am: 1caeb8b527

Change-Id: Ibf11485774dbfa29e183104a58fb338e9e656786