Merge tag 'LA.UM.5.8.r1-01500-8x98.0' into n7.1-caf

"LA.UM.5.8.r1-01500-8x98.0"