Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.028' into rvc-dev am: 624266e046

Change-Id: I2f37ae9cb4dc3ff9e16e2c6397f155c314e40204