Use output/error maintenance functions

Change-Id: I9f9ebee9e577ab3cc7a042e5280161d2b2bad57a
Merge "Use output/error maintenance functions"