Summary: Finish the job started by 8176536 Reviewed-by: mbalao
Reviewed-by: chegar
Reviewed-by: darcy, weijun
Reviewed-by: xuelei
