8182388: Backout 8182143

Reviewed-by: xuelei
2 files changed