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