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

Bug: 123862805
Change-Id: I997ad01c775b290da51ca80eeda40de61d52c82e