Move wrapper prop to 2.1

Change-Id: Ib050a7c147867ae3d54f36f625808d7f3d3bc41b