Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs