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

Bug: 123862805
Change-Id: I4f379ead23217d113e6de68c5c309916bc464a08