Merge "Small lint fixes for FingerprintDialog sample." into nyc-mr1-dev