am 242e7188: am 335d8fd9: am 0ff36b1a: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac

* commit '242e7188ebc09598751faf009a5d5cdba618fd17':