am 318ad598: am 17f00fb6: am a23b2011: Merge "Fix ColorMatrix performance and correctness issues." into klp-dev

* commit '318ad598018ae49712e525f7e188f7ba6dafa5ee':