Also:
- update performance improvements for CL 31275.

Change-Id: I2f2ec0a42b248643e76df8654e11bf0b01a5d030
Reviewed-on: https://go-review.googlesource.com/33114Reviewed-by: Robert Griesemer <gri@golang.org>