Patch skipif decorator
This needs to get upstreameed

Change-Id: I5dd8501b64d67fe921476e763a6e817857379de1