Merge "More test_defs cleanup." into froyo