Merge branch 'qcom/release/LA.UM.7.8.9.08.00.00.478.042' into pi-dev
am: 268dbc287a

Change-Id: Ia9ed0316590028520efae9ed45a083a5e65ffbb7