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

Change-Id: Ic44da5bb64cb4da9959f29fcbd99527214b89b18