Merge "Merge "VIMS should only stop the keyphrases it started." into nyc-dev...
Merge "Merge "VIMS should only stop the keyphrases it started." into nyc-dev am: cac94950 am: f94da7ef" into nyc-mr1-dev-plus-aosp
am: e4932b1f
* commit 'e4932b1f':
Change-Id: I4b4ba37474fce8d181b49f2d1df2c46b02f79556