port test fix r175242 from trunk -- it was not merged properly to google/main