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

* commit 'd81ee05f2c83481bf66c9e8b1aa790980085ac33':