Merge "Small lint fixes for FingerprintDialog sample." into nyc-mr1-dev am: 34e5635f am: 37b50957 am: a0af9eda am: 8e0d6e5f Change-Id: I20115b167b0bff1ffb4b1926670d90d8cfd08693