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

Change-Id: Ic37c9fa91cc637ec2ab61ea10afa8e928442d16f