Reviewed-by: alanb, vinnie, xuelei
Reviewed-by: dholmes
Reviewed-by: wetmore
Reviewed-by: darcy, weijun
