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: 9ea55c0c
Change-Id: Ifcd9cedbd3b0d66dcc7a6877d292d6a53422ab78