Merge tag 'LA.UM.5.6.r1-04300-89xx.0' into nougat-mr1

"LA.UM.5.6.r1-04300-89xx.0"