Merge "More framework tests cleanup." into froyo