Merge "Rename DEFAULT_CARD_INDEX"
am: 038d1b5b27

Change-Id: Ifa033d9afac5ac1a6f454cbfe5de14149018f254