Merge tag 'LA.UM.6.4.r1-05200-8x98.0' into oreo

"LA.UM.6.4.r1-05200-8x98.0"