Updates from internal repo

This pull request brings the public repository up to date with the internal repository. We'll switch the Edge Code submodule to point here instead of the internal repository after this is merged. We'll also now go through the pull request process to make changes to the master branch. (OK @ryanstewart?)