Merge "Throw better exception when startVoiceActivity fails" into nyc-dev