R=rsc CC=golang-dev https://golang.org/cl/194066
R=gri,iant DELTA=47 (43 added, 0 deleted, 4 changed) OCL=33127 CL=33173