am 8237a1a0: am f9f15e5f: am a75b19dd: am 71dbe44d: Revert "Revert "CTS: Fixes a possible "out of memory" exception""

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