LGTM=adonovan R=adonovan CC=golang-codereviews https://golang.org/cl/127050043
LGTM=adonovan R=adonovan CC=golang-codereviews https://golang.org/cl/120140043