Reviewed-by: chegar, dfuchs, rriggs, vtewari
Reviewed-by: xuelei Contributed-by: alexandre.boulgakov@oracle.com
Reviewed-by: darcy, weijun
