Merge "Card ID APIs are public"
am: bd4a4dc889

Change-Id: I2cf670328f7b2f35d6009eecb0e3741311d6e2df