Merge tag 'LA.UM.5.6.r1-04600-89xx.0' into n7.1-caf

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

Change-Id: I6ffc700179259cb92054a756b6fd24be2a0f6209