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