Merge tag 'LA.UM.6.5.r1-06700-8x96.0' of caf into lineage-15.1-caf-8996

"LA.UM.6.5.r1-06700-8x96.0"