Merge "Support restricted card state." into nyc-mr1-dev