SortColors I && II

Change-Id: I333d915b135f867703e379f4c61fe80bbc29c088