Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.110'

Bug: 172519827
Change-Id: I53df54b39c86deb6b8a036cfdc60c8eefcb0a584