Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.08.00.00.478.078' into pi-dev
am: 822c008d7b

Change-Id: I794b251b57ce86acb1c51f2e63b4c981dfd75126