[automerger skipped] Merge "remove client token passing active VI service" into rvc-dev am: 626b24958f am: cfa9b4d56f -s ours am: 4cba22e65c -s ours am: 7306d07d09 -s ours
am skip reason: Change-Id Ie2c4653d365770a9123a22bc69822518b4ccc568 with SHA-1 1ec50c8f2f is in history

Change-Id: I6bb343279fc6b368cded9e5953babe95cb05a3d6