Merge "Hide VOICE_ASSIST intent DO NOT MERGE" into jb-mr2-dev