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

Change-Id: I01f692007628850151e023a9dd8fdb9d9451527a