Merge \"Remove redundant 601 test, it\'s all in 600.\"
am: 90187c9858

Change-Id: Ibdc01b2f1047bca176c39942e5e80097706ad570