Merge "VIMS should only stop the keyphrases it started." into nyc-dev
am: cac9495030

* commit 'cac94950301557eee97e3a961025ad76c3300dda':
  VIMS should only stop the keyphrases it started.

Change-Id: I02c29caf74f7ee10e4d8fe6766f6d05ddeec7270