Merge "bug fix: output colorformat configuration fixed" into oc-dev
am: 1e15657ca1

Change-Id: I1bf3c443058ab57baba7c51e3f9f0ae662e61882