Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread