Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev