Reviewed-by: skoivu, rhalade, rriggs, chegar, coffeys
Reviewed-by: darcy, alanb, olagneau
Reviewed-by: darcy, weijun
