Merge "Add keys to retrieve color aspects from metadata" am: 6636b0227d
am: a2ec9e32c6

Change-Id: I20dd7e842ae0a8172a188b4d1889daea759e14b2