Merge \"Add tracing events for system service lifecycle events\" into nyc-mr1-dev
am: e9d6d6dcf5

Change-Id: Ica736b9d5d0e25cdb41945dccf25fb1810edbb17