Merge "Card ID APIs are public"
am: bd4a4dc889

Change-Id: Ie436f74a0501d46ac12ea641ab71741fc6cbf3ba