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