Continuation of CL 20111.

Change-Id: Ie2f62237e6ec316989c021de9b267cc9d6ee6676
Reviewed-on: https://go-review.googlesource.com/32830Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>