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

* commit '82d2ffe29d19f8a5bd59ff215c4bd0ad558e1ca6':
  Revert "CTS: Fixes a possible "out of memory" exception"