Merge "Clean up more test configurations (Part 2)."
am: d3f44e6571

Change-Id: I8bc2160a83ca0dd0c68c44647416f3f876fc436e