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

* commit '49fe761ddcf779f1913d22706a2a6153b80aa397':
  Cherry pick from master: Sample app and test package for a Service