Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.035' into rvc-dev am: aecb2bf532 am: 59a00bf315

Change-Id: Ifb54ebe21e342cd547e1490cea880cb1a31db48c