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

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