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