Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.035' into rvc-dev am: 29d3fe29dc am: ac088c13fa am: 11866462a2 am: 7979597b52

Change-Id: I6cafd40af6974f1349cff497867e32d66a332edf