Merge "Remove broken contacts test app intents" into nyc-dev am: 9c63a6b6bd
am: 36651ad2f0

* commit '36651ad2f098b3bc2c0144e724a0300c14153135':
  Remove broken contacts test app intents