Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev am: 37bfd57ead
am: fcbc2800db

Change-Id: I1abf46b2204d6c2e382a2aefcf02bbab47fcdf25