Merge "Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.030'" into rvc-dev am: 2667cec0a6 am: 85d83e9c89 am: 2254cf24dd am: 6185b087e6

Change-Id: I242f118176ed4e3dc152b057b60d08d56310a1b6