Merge "bug fix: output colorformat configuration fixed am: 56906949cc  -s ours am: 86995ef4e4  -s ours" into oc-mr1-dev
am: 9088105332  -s ours

Change-Id: I86620992415ba954711e33ed3f60ad17b799c4cc