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

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