Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev