Merge "Make CardView respect the theme it is running in" into mnc-ub-dev
am: e1c89f8bc2

* commit 'e1c89f8bc2fa3bd964fa993ca005dd76ad83c1ff':
  Make CardView respect the theme it is running in