Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.478'

Bug: 261541074
Change-Id: I74b3279b3f339c73f5a7d76000e50d0ad43cf11f