Merge "Small lint fixes for FingerprintDialog sample." into nyc-mr1-dev am: 34e5635f am: 37b50957 am: 3ec90763 Change-Id: I257ebe80cfc2a9ca5dcbccb6f9d8183a267395f8