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

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