samsung colorformat
merge cm changes
merge cm changes