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

Change-Id: If4645f2d3833064d2db645423b63c10150299f59