am 5e5aeb46: Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev

* commit '5e5aeb46849e21b605ef59a691bca478eb4fa380':
  fix javadoc build also add some docs to the service