Merge "fix ChangeIds population from voiceinteraction"