Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.030' into rvc-dev am: d1e05282d0 am: 48ca1b74c0 am: feae01f756 am: 789660e09c

Change-Id: Ied5bfbd912cdd03420e6f8ef49c62a8541eedfa9