am bfe2ee46: am 5695eb5b: am befe5feb: am 09db5570: am d264fc1f: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac automerge: 0ff36b1

* commit 'bfe2ee4639d022ee7119f5a937ba837e0ef90400':
  DEV HACK: cts: increase permitted colour delta