Merge "Card ID APIs are public" am: bd4a4dc889 am: a039e692a4
am: 316dc44a91

Change-Id: Ibb4966a27a96f1e50b42f616556a4e843050557a