Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.08.00.00.478.078' into pi-dev
am: 37c0028913

Change-Id: I8970898a77dde87279d12415c9a6b7742fd1001b