To be fixed later.

Updates #10730

Change-Id: Icac19f48c9e035dce192c97943b77b60411a3ea2
Reviewed-on: https://go-review.googlesource.com/9797Reviewed-by: Mikio Hara <mikioh.mikioh@gmail.com>