Merge "Fix "touch" strings for KeyChain." into nyc-dev