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

Change-Id: I482e68494c3da742ee487b5efb299f030669791b