Merge "Fix bug in IntentService and Service example code." into nyc-dev