Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.081'

Bug: 127924739
Change-Id: If569ffb06a5031d1b9e07a0064a5cf06ca83fee6