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

Change-Id: Icfa9ef9cc9735b8edd7a34c74b2f2aaf0742d79a