Merge "Fix text appearances not working in colored button styles" into nyc-dev
am: 163236156f

* commit '163236156f28449272e16193930692d2cc0011cb':
  Fix text appearances not working in colored button styles

Change-Id: I229589acdd58746f4a230643ae025fa4639a7991