Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 2dada0881c am: 350cc7b066

Change-Id: Ie5e919eda756d4f55cee05e2238c7706d13c97a1