am 5ff96b94: Merge "Doc update: restore missing GCM updates" into klp-docs

* commit '5ff96b946b10825c504c3ee3f00be04f81d3a44f':
  Doc update: restore missing GCM updates