[automerger skipped] Merge "remove client token passing active VI service"...
[automerger skipped] Merge "remove client token passing active VI service" into rvc-dev am: 626b2495 am: cfa9b4d5 -s ours am: 4cba22e6 -s ours
am skip reason: Change-Id Ie2c4653d365770a9123a22bc69822518b4ccc568 with SHA-1 1ec50c8f is in history
Change-Id: Id09f56f1b8e96d0fb10bdaf7bbb26a9a857508b1