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