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

Bug: 124450013
Change-Id: I852c6bbbca0c874f0f0def96280904e42c99daf5