am 3d55a4c9: am 1d377a19: am 27ed953f: (-s ours) am 9f942089: Merge changes I9bd42a8a,I613d0b12 into jb-dev
* commit '3d55a4c9':
cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Doc update: Misc minor GCM updates.