Merge "The VIS should return an AOHD regardless of keyphrase availability." into oc-mr1-dev