am d21b9a9e: am 2f140f96: Merge "Doc change: GCM changes" into jb-dev

* commit 'd21b9a9e2192e1a1803c2a19290e6badc7f69caf':
  Doc change: GCM changes