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

Change-Id: Ia38c21b2b86f3773338b5ecf859f8653e465b3eb