Change-Id: I6e7035db4b3e2a09e5655eb7646eea9d99fb7118
Reviewed-on: https://go-review.googlesource.com/c/162917Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
(cherry picked from commit 4c89a10f)
Reviewed-on: https://go-review.googlesource.com/c/162889Reviewed-by: Zhou Peng <p@ctriple.cn>