Merge "Color balancing framework assets" into ics-mr1