Merge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into nyc-mr1-dev am: 2f5ab90e70
am: 27fc8ed383

Change-Id: Id769c6f609e2c5667a5b13e911d8543afb48cc04