Keep track of service pids. am: cdf9472ffb
am: 2b2fad27e2

Change-Id: Ia53c6a56c403f5dbe54d26f840ac05f70bb0953a