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 am: 467aca24ff

Change-Id: Id8ac89544a4f4ed965e7721f5722cb14bf098fca