Merge "Clean up more test configurations (Part 1)."
am: 02089bfdba

Change-Id: Iebf1128edbd218ae8c6dde6e4dc15a58e4d0310b