Merge "Rename @EnumEntry and @FlagEntry"