Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.08.00.00.478.042' into pi-dev
am: 9188a70558

Change-Id: I6976b409a15fd09188bc9f76f931a0802aeb03b1