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: 3514e733
Change-Id: I1fecbfe282799660bfd751b3533d0a7dae5cee43