Reviewed-by: sla, egahlin, jbachorik, allwin
Reviewed-by: alanb, darcy, mchung
Reviewed-by: darcy, weijun
