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