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

Change-Id: I4270a6f4fc3b0ab34851d073d45896ef0f558fcd