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 am: 29a107d6fb
am: a066d53106

Change-Id: Ia3e1732516d3e30f3fce698dc6a6048351eac6de