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

Change-Id: If74f86a089ab5a093387c6a1e9708961ff8cf4fc