Merge "Fix in handling wrong cu_qp_delta" into security-aosp-mnc-mr1-release