Summary: Finish the job started by 8176536 Reviewed-by: mbalao
Reviewed-by: xuelei, mullan Contributed-by: alexandre.boulgakov@oracle.com
Reviewed-by: darcy, weijun