Merge "Add a sample service for testing init." am: d7b5c7b2da
am: 41aa8f07b2

Change-Id: I820f146edb70f86127003353efee1e60ee92608f