Revert "Revert "CTS: Fixes a possible "out of memory" exception""

Bug 4298542

This reverts commit 1a729f42c0d44f4c2a4818ffe9f4983ce2e52425.

Change-Id: I36f37e0966aed13efe7443ee0e11277f8ff700a0
1 file changed