Reviewed-by: lancea, chegar, psandoz
Reviewed-by: alanb, vinnie, xuelei
Reviewed-by: jjg, darcy, weijun
Reviewed-by: darcy, weijun
