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

Change-Id: I9bc692b30995580f1e3ddf8b27fadbbec25d78f9