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: Iff3e12d291cb739736d59740f35e4e9a2008d591