Merge "The test branches to alphabetic or numeric one" into froyo