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

Change-Id: Iafce2c0fad7832bf08bf8f97f35ea390d32653f5