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

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