Fixed problem where alpha value was being included in color when it was
only for internal use.

Change-Id: I3ab96667ad51591c1a9a820c24f7fc5b0ca7bcf7