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

* commit '335d8fd9a2b3d9793455b6da63e3d614aa87ce26':