Adds cleanup and moves the skip before the action. Change-Id: Ic181a8c978ef535e6b5faf40b8501ca22fc85be4