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

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