Merge tag 'LA.UM.7.1.r1-04500-sm8150.0' into pi-dev

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

Bug: 115750368
Change-Id: I7764fe745b38c83367bf1f3aee24462a139b5dda