Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.08.00.00.478.137' into pi-dev

Bug: 120390132
Change-Id: I5e4edd6e3a484313dd220c48ed5ef2123bc317d4