Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.035' into rvc-dev am: 29d3fe29dc am: ac088c13fa

Change-Id: Iaa61126f96b17586e3365402cfc4d06dcb70c9b0