Reviewed-by: alanb, shade
Reviewed-by: darcy
Reviewed-by: lancea, chegar, psandoz
Reviewed-by: darcy, weijun
