Merge "Small lint fixes for Confirm Credential sample." into nyc-mr1-dev am: dc25eecf am: bda55f89 am: b8bbd967 am: c34975e6 Change-Id: I2a0d42ce7915abcd1b3ca03c03fd4f2e53211509