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