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

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