Merge "Remember the process that token was added for also for the services...
Merge "Remember the process that token was added for also for the services that are already running" into qt-dev am: b112f3f6 am: f29eccc2
am: 89f35269
Change-Id: I146d4c08a646d590b76a28c068dadb904934e2a4