This reverts commit 49036be4. Reason for revert: TestSmartStatusOutputWidthChange is flaky Change-Id: Ie5231dbbab2887ce4c4697f3fe6e52cfd6f4dd17