Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.1.R1.09.00.00.461.061'

Bug: 118095063
Change-Id: Ic0186ecbb17faf8a8fd914c054d5c0f698f17174