Merge "Group CtsVerifier Tests into Categories" into froyo