Revert "Added moar tests for custom description and DELAY_SAVE integration."

This reverts commit 7f257c997fb6414c5fd38e39c81fa9463245aa4d.

Reason for revert: broke CTS tests

Change-Id: Iaf5f71950b5c80c576d5bd77b6a14031d2ed898c
7 files changed