Merge "Fix genHiddenBuilder generating an invalid buildUpon() method"