Merge "Delete the checkin directory with the wrong context"