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: 894d2ad2
* commit '894d2ad2':
Change-Id: I2c541a67ac1be8ec20a77a3d0d4b823adb115ec8