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

Change-Id: I1ff4067459e7d2850d5494b96f71c2ba21d761a2