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

Change-Id: Iee420fcb4df06d89f56966779cc4dd4d885321e7