Merge "Fix API feedback on Color" into oc-dev am: 03758701fb
am: 7700c2b238

Change-Id: I64f6dcabfd1722475947be3b3e3cc636b724dbed