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

Change-Id: Ife5a210e828da9bdcf64846eb2828f10bd42be9e