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

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