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

Change-Id: Ib347e746d05b1e0b49fc9f771fe480e6011218c9