am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev

* commit 'd181ffe6881d0a1b49193b5f70dac0cc7cc9aae3':
  Resolve color xml attributes properly. [DO NOT MERGE]