Merge "Add color aspects keys"
am: 8ecc7c198c

Change-Id: I368c1c13892cc2af5877f816ba7d5ed05a355910