Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.9.R1.09.00.00.558.029' into HEAD

Bug: 138457337
Change-Id: Icbc4b186dd7063f53fe29168b5909296ed4a3633