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

Bug: 128639903
Change-Id: I07a47e0744a24448d251f6e4fff2549b047c04c6