Merge "DO NOT MERGE:backport test imrpovements from newer platform" into gingerbread