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

Change-Id: Id41e2543199ee008aae7073de3d176207d3ce376