Move a pending step to the end to get more passing steps

Change-Id: I2bfd0ed60838cc4f75b1e3340aabe7654bebb9ff
Merge "Move a pending step to the end to get more passing steps"