Merge "Don't flash colors when hinting" into oc-dev am: 275e0582c3
am: 8a7b5d5807

Change-Id: I6070e62da134660885721011ac77a0027ba8420c