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

Change-Id: I738d9b7a719392e1653d42dc4365a6dcda537bac