Andrey Mirtchovski (individual CLA),
	Maxim Ushakov (Google),
	Yongjian Xu (individual CLA)

R=gri
https://golang.org/cl/174064