Reviewed-by: dholmes
Reviewed-by: lancea, mchung
Reviewed-by: darcy, weijun
Reviewed-by: tbell, alanb
