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

Bug: 112819790
Change-Id: Iee6c36568862c7b3caa4be03e657913ad00f7cdf