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

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