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