Merge "Remove broken contacts test app intents" into nyc-dev