Merge \\"Add another purchase button that uses a key which isn\\'t invalidated...
Merge \\"Add another purchase button that uses a key which isn\\'t invalidated even if a new fingerprint is enrolled.\\" into nyc-dev am: 18bd61c8
am: e05cb4c8
Change-Id: I769b6431458bae5eb01359512a8bfb372dd32584