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

Change-Id: I2991c2f8443d08e04b4a6399d4e0a76718ec7f4d