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

Change-Id: I36845dbc0582c922d7b5fa5d1e8b15e2ca563a87