Merge "NullPointerException when starting VoiceInteractionManagerService"