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