Merge "A little more improvement of the Service javadoc." into froyo