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

Bug: 122718553
Change-Id: Icfbe3a153b11741be4855cf8c45fd013ea912762