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

* commit '22e9225ab13347e3653449af0306bc87fa7965f2':
  fix javadoc build also add some docs to the service