Merge "Merge "Fix text appearances not working in colored button styles" into...
Merge "Merge "Fix text appearances not working in colored button styles" into nyc-dev am: 16323615 am: 62eec265" into nyc-mr1-dev-plus-aosp
am: ab690b2c
* commit 'ab690b2c':
Change-Id: I7838ca1771627b4d7c84de1e76072e134ae49a5b