Merge "Revert "CTS: Fixes a possible "out of memory" exception"" into gingerbread