Merge "Improve the color comparison" into kitkat-cts-dev