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

Change-Id: I9517d9cc4773c2c8578ba6c3707bdb88f392d687