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
Change-Id: Ic9a2a62990f645e511bbc85e318c84b0e3f0fc7d