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

Change-Id: I56a7277e413590cd2c8c2a20b4e11d65f92f2bfe