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: 156cc48685

Change-Id: Idbeedcc6a18eeda54903e7169c8374e2fbcaaf05