Merge "Fix in handling wrong cu_qp_delta" into lmp-dev am: 98f9e26d24 am: 10f2b105f5 am: b4ddce56d1
am: 59b232588b

Change-Id: I327b698965d66637fbc6e5a84230caa80df01f68