Merge "Fix color sampling API per review comments."