Merge branch 'qcom/release/LA.UM.7.3.9.08.00.00.385.328' into pi-dev
am: 0d5a12066d

Change-Id: Ic1ed88e93ae466d7ce8c13a36a6ca09b69def44c