am 0629f275: am ff367fdd: am 8a8ad882: am 1510424e: Merge "Improve the color comparison" into kitkat-cts-dev

* commit '0629f2757bb53953997115ff40c6f471bdb87df5':
  Improve the color comparison