Move the stashed user step to the right file

Change-Id: I4bd86320766e88347a90187398a8dbcafdb7638e