Merge "Doc update: GCM doc cleanup." into jb-dev