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

Change-Id: I0aec802b14140ed8f5efecb598be30d260a11d44