Merge "Frameworks core tests size cleanup." into gingerbread