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

Change-Id: I6cdd15495b5441fb5a617082f7af3d9e15cbca22