Merge tag 'LA.UM.6.2.r1-09300-sdm660.0' into oreo-mr1

"LA.UM.6.2.r1-09300-sdm660.0"