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

Change-Id: Iacb4d0b8c8d221f30f16cb9233dc48d8d356e521