Merge head r275327 through r275329.