Reviewed-by: alanb, ahgross, coffeys, dmocek
Reviewed-by: alanb, darcy, mchung
Reviewed-by: darcy, weijun
