Fix for rootwrap 2

Change-Id: I5e6c4032ed08db2db579650cb1a1195c37a8cfd9