Refactor order of steps, minor

Change-Id: I7084775fea12cf538ba409fcbca88c9f89d4befa
1 file changed