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

Change-Id: I13deed6f7228e9160333b35f81a6e54a7468224a