Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C1.08.00.00.516.083'

Bug: 124397977
Change-Id: I8a555230418c7d36d503f403351b01f585c06543