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

Change-Id: Idf0a2eed4fda7bbe9b8c830de703f8330156451d