Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.08.00.00.478.137' into pi-dev
am: 9116539540

Change-Id: I72d2a82dcda580cb53c82b80049f8fc75f7584de