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

Change-Id: Ifcc5abd42137fb207f7bb588e41c0bcbbea5b243