Cherry-picking from private repo.