R=golang-dev, dave CC=golang-dev https://golang.org/cl/6948057
R=golang-dev, agl, r CC=golang-dev https://golang.org/cl/6535043