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

Change-Id: I271122b6f760ec927c8e1d5b32abeb0d0b083485