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

Change-Id: I9ccf940b5e2d47bbb29fcb12bea3c20d2ea9ae69