Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0

Change-Id: I00930def061a4912dcb94cf1787b2f1f05758a86