Reviewed-by: darcy, weijun
Co-authored-by: Joshua Bloch <joshua.bloch@google.com> Reviewed-by: jjb
Reviewed-by: jjb