Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 463d752f5b am: 6bedc0adc6

Change-Id: Iae0160bffcec90bf6457302d7391f1cddf9a4cea