Merge change 5732 into donut

import java.util.HashSet;

import java.util.Map;

import java.util.Set;

import java.util.ArrayList;

import java.util.regex.MatchResult;

import java.util.regex.Matcher;

import java.util.regex.Pattern;

     */

    public static void assertContentsInOrder(

            String message, Iterable<?> actual, Object... expected) {

        Assert.assertEquals(message,

                Arrays.asList(expected), Lists.newArrayList(actual));

        ArrayList actualList = new ArrayList();

        for (Object o : actual) {

            actualList.add(o);

        }

        Assert.assertEquals(message, Arrays.asList(expected), actualList);

    }

    /**