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

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