Merge branch 'master' into cloud-update

Adding Mary's cloud docs.

BUG=
R=kevmoo@google.com, sgjesse@google.com

Review URL: https://codereview.appspot.com/160250043