Merge "Add color aspects keys" am: 8ecc7c198c
am: 34eb61ee6d

Change-Id: I86bbf7c32aba51acac1b87dbda3f2ac128c57561