am d42b977a: am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs

* commit 'd42b977aacfba6646edb5331d9321ad1f02c7258':
  Doc Update: GCM cleanup