6838046: Rollback 6762511 due to build failure (6838003)

Reviewed-by: yan
7 files changed