am 37580d58: am 823f4502: am e918375b: Merge "Fix ColorMatrix intrinsic." into klp-dev

* commit '37580d58f2c132d0437a0b5c87e9ffb9a5bc7db2':