Merge "K-Means color clustering" into oc-dr1-dev am: 11cc260047
am: af26f72fb8

Change-Id: I1985de652f8d4643a8a5a170fd7f43c33c6c0bd7