Track a fork of slim's cards with some vanir compatibility changes

Change-Id: I4f7e255fd3159ce08bcd2493138bca673bda5cc8