Merge "Rename DEFAULT_CARD_INDEX" am: 038d1b5b27 am: 6802dbb6d5 am: 520be09949
am: 87bc4f1ee7

Change-Id: I1e62b6ed85c8789bcb19e134ef05ad8a2b89a428