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

Change-Id: I07425c37fc83c41411335adba360e0f0685023aa