Merge "The VIS should return an AOHD regardless of keyphrase availability." into oc-mr1-dev am: 0a14929b am: edb86c39 Change-Id: Ia298587cd12331206038f70ddc949782105558f0