Backed out changeset a0c4559f5d2e for cpp unitest orange