Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C3.08.00.00.787.028' into sc-dev

Bug: 189388424
Change-Id: Ibaba35361c981b47745bf8812ee303fd8714fa85