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: ac972a6108 am: 22b887646c

Change-Id: I6058a76bd6af66f1aa3e9bac4db5394113eeb222