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

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