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

Bug: 121228685
Bug: 122560586
Change-Id: Ic8e8b796d90f6ac7638be768b45a70c3846ae682