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