Reviewed-by: dxu, alanb Contributed-by: yiming.wang@oracle.com
Reviewed-by: alanb
Reviewed-by: darcy, weijun
