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

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