Merge branch 'LA.UM.8.13.R1.08.00.00.571.023' into qcom-msm-4.19-7250

Change-Id: I774438447fb24e9d9aa7317d3304781bbbdb310e