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

Change-Id: I6041944772567794b79a355c9f77767ed61c0f76