Merge tag 'LA.UM.7.1.r1-15800-sm8150.0' into pie

"LA.UM.7.1.r1-15800-sm8150.0"