Reviewed-by: ohair

Reviewed-by: darcy, ohair

Reviewed-by: darcy

Reviewed-by: sherman

Reviewed-by: darcy, weijun