Merge "Support restricted card state." into nyc-mr1-dev am: 5aacb37a2f
am: ea1d43563b

* commit 'ea1d43563b04ea9febfcfb65e859818133c83fcd':
  Support restricted card state.

Change-Id: I8e8555184363bc85c8795043403b86409f8597c8