Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev