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

Change-Id: I0f184c85a5b5b03f02b0bc12ea47d3c68c2a391a