R=golang-codereviews, iant CC=golang-codereviews https://golang.org/cl/44810044
R=golang-dev, r CC=golang-dev https://golang.org/cl/5572056