am 71dbe44d: Revert "Revert "CTS: Fixes a possible "out of memory" exception""

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