am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs

* commit 'f2fcbff8382b93bd779af546a7dda8f85eba3763':
  Doc update: misc GCM fixes