am 24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev

* commit '24963e1f7b7ba2712618b8c0ff1750c47ad1c789':
  Revert "docs: gms javadocs"