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

Change-Id: I84f1f665dfc9c7f5dee790ffa634951871ae2f2a