LGTM=nigeltao R=nigeltao CC=golang-codereviews https://golang.org/cl/152420043
LGTM=adg R=adg, nigeltao CC=golang-codereviews https://golang.org/cl/151840043