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