Updates #15810

Change-Id: I37f14a0ed1f5ac24ea2169a7e65c0469bfddd928
Reviewed-on: https://go-review.googlesource.com/23559Reviewed-by: Michael McGreevy <mcgreevy@golang.org>
Reviewed-by: Andrew Gerrand <adg@golang.org>