Reviewed-by: dholmes
Reviewed-by: darcy, lancea, alanb, briangoetz, mduigou, mchung
Reviewed-by: darcy, weijun
