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

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