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

Change-Id: I4bd65236813aa8b91138784a117896eab22717fd