bug:10641374 Additionally, fixes incorrect getColor use Change-Id: Ie56ad5baa099cc421629a5dcc8ef9de14e44079a