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

Bug: 117810284
Change-Id: I3c1a7e8c21026ce8eab7a5d9303927fde2211a42