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

Change-Id: I328f914315a71715d302b38a8e8cf4686c531a30