This should make this step more robust to remote failures. Change-Id: I3f3d643ac5285027bda909ac6d55d8959a4b4f79