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

Change-Id: Id376ba48694482d651a443ee5bf9fd53cfcf02d8