Merge "Rename DEFAULT_CARD_INDEX" am: 038d1b5b27
am: 6802dbb6d5

Change-Id: Ia8f9ca41a0fde2bc42726a949f623e1e85814ae0