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

Change-Id: I609a7d2b54524d5367592031a933bf6dec46154f