Merge "Identity Credential: Apply changes identified in API review." am: e3643bcb am: 3ff7ba66 am: bb5ff347 Change-Id: Id312216d241c689d7ae4711eef0affa61e0c8535