Merge "Fix borderless colored button text color" into nyc-dev am: 8f0ab27570 am: aa833d7c20
am: 040fa53a39
* commit '040fa53a39d3b8501fbf3e28597ed65e97607f59':
Change-Id: Ia56d87320c85b37566daa10805f877caed490197
This commit is contained in: