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

Change-Id: Iaa55b97e45a18937290a931f4f23a33d63ac5665