Restore non-DASH output support.

Change-Id: I6815f7c3eb001476ec7848b4f34a19c36fd15e35
2 files changed