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

* commit '1c92ce10b5123bc374f8cba2c61c4c56f9d4f319':
  Revert "docs: gms javadocs"