am b67ab7cc: am 648de548: Merge "docs: gms fixes" into jb-mr1-dev

* commit 'b67ab7ccd6d09d30caf8a85a9ea20fc991652258':
  docs: gms fixes