Merge "Fully remove deprecated --no-test-mapping argument."