Merge "Fix text appearances not working in colored button styles" into nyc-dev...
Merge "Fix text appearances not working in colored button styles" into nyc-dev am: 16323615 am: def15105
am: f34dec95
* commit 'f34dec95':
Fix text appearances not working in colored button styles
Change-Id: I1e57c83ba59c6394a45de292d65de5735547a21f