am 0ddd915f: am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev

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