[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: 4ddef1c7 am: 4d73169a -s ours
am skip reason: Change-Id Ie2c4653d365770a9123a22bc69822518b4ccc568 with SHA-1 1ec50c8f is in history
Change-Id: I51940a82e5c51465556a0b2d2c6e3c19d83a50e5